From 703092f2c9900ffb085e801d9be4122474226994 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20M=C3=BCllner?= Date: Mon, 31 Jan 2011 22:54:34 +0100 Subject: [PATCH] build: Default to libedataserverui-3.0 instead of 1.2 The official GNOME moduleset builds evolution and e-d-s against GTK+-3, so libedataserverui-1.2 is no longer part of the release. As GNOME Shell can actually be build with either version, prefer libedataserverui-3.0 if it is available and allow falling back to 1.2. if it isn't. https://bugzilla.gnome.org/show_bug.cgi?id=641085 --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2cab70d09..27091de0f 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,8 @@ GTK_MIN_VERSION=2.91.7 GIO_MIN_VERSION=2.25.9 LIBECAL_REQUIRED=1.6.0 LIBEDATASERVER_REQUIRED=1.2.0 -LIBEDATASERVERUI_REQUIRED=1.2.0 +LIBEDATASERVERUI2_REQUIRED=2.91.6 +LIBEDATASERVERUI3_REQUIRED=1.2.0 # Collect more than 20 libraries for a prize! @@ -117,7 +118,13 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0], AC_SUBST([HAVE_BLUETOOTH],[0]) AC_MSG_RESULT([no])]) -PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED) +# Default to libedataserverui-3.0, but allow falling back to 1.2 +PKG_CHECK_EXISTS(libedataserverui-3.0, + [EDS_API=3.0 + LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI3_REQUIRED], + [EDS_API=1.2 + LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI2_REQUIRED]) +PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-$EDS_API >= $LIBEDATASERVERUI_REQUIRED) AC_SUBST(LIBECAL_CFLAGS) AC_SUBST(LIBECAL_LIBS) -- 2.39.5